viewSelector: Remove showApps()

Now that Overview is able to ease into any state, be it window
picker or app grid, we can move this ViewSelector method to
Overview itself, which is its rightful place to live.

Remove ViewSelector.showApps(), and make all callers call
Main.overview.show(ControlsState.APP_GRID). Also make sure the
show apps button is correctly toggled.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1624>

diff --git a/js/ui/overview.js b/js/ui/overview.js
index 0020dcd4f21bd4332fae8ee7f2de6c9f023a1ef1..6f838db6b701b548f8fe8095ba17d9509c5fd093 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -605,6 +605,10 @@ var Overview = class {
             this.show();
     }
 
+    showApps() {
+        this._show(OverviewControls.ControlsState.APP_GRID);
+    }
+
     getShowAppsButton() {
         logError(new Error('Usage of Overview.\'getShowAppsButton\' is deprecated, ' +
             'use \'dash.showAppsButton\' property instead'));

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 2f584d2090453c0a85c056367c69a4f32ee88e07..f836f822eaa9c6da1ac36d0b615e2ad190fdf2f0 100644 (file)
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -178,6 +178,8 @@ class ControlsManager extends St.Widget {
     }
 
     animateToOverview(state, callback) {
+        this._ignoreShowAppsButtonToggle = true;
+
         this.viewSelector.prepareToEnterOverview();
 
         this._stateAdjustment.value = ControlsState.HIDDEN;
@@ -189,6 +191,11 @@ class ControlsManager extends St.Widget {
                     callback();
             },
         });
+
+        this.dash.showAppsButton.checked =
+            state === ControlsState.APP_GRID;
+
+        this._ignoreShowAppsButtonToggle = false;
     }
 
     animateFromOverview(callback) {

diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 181bd1631011aa6606e5c15093b37cd90e4f508e..14e449f7484d5f06af51582ac29c9d462877f4a7 100644 (file)
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -10,6 +10,7 @@ const Main = imports.ui.main;
 const Screenshot = imports.ui.screenshot;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
+const { ControlsState } = imports.ui.overviewControls;
 
 const GnomeShellIface = loadInterfaceXML('org.gnome.Shell');
 const ScreenSaverIface = loadInterfaceXML('org.gnome.ScreenSaver');
@@ -104,7 +105,7 @@ var GnomeShell = class {
     }
 
     ShowApplications() {
-        Main.overview.viewSelector.showApps();
+        Main.overview.show(ControlsState.APP_GRID);
     }
 
     GrabAcceleratorAsync(params, invocation) {

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index bbd412ff05cd4b8d9717659330ca58f8511f9d34..1abdf9cff219d19f498e8e8dd835c495e739c502 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -369,7 +369,7 @@ var ViewSelector = GObject.registerClass({
             if (Main.overview.visible)
                 Main.overview.hide();
             else
-                this.showApps();
+                Main.overview.show(ControlsState.APP_GRID);
         });
         global.stage.add_action(gesture);
 
@@ -391,11 +391,6 @@ var ViewSelector = GObject.registerClass({
         Main.overview.show();
     }
 
-    showApps() {
-        this._showAppsButton.checked = true;
-        Main.overview.show();
-    }
-
     prepareToEnterOverview() {
         this.show();
         this.reset();